projects
/
project
/
bcm63xx
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8fa4635
)
fsl: common: pfuze: no use original pfuze code if DM_PMIC
author
Peng Fan
<
[email protected]
>
Fri, 7 Aug 2015 08:43:46 +0000
(16:43 +0800)
committer
Przemyslaw Marczak
<
[email protected]
>
Wed, 12 Aug 2015 09:05:11 +0000
(11:05 +0200)
If enable DM PMIC and REGULATOR, we should not use original power
framework. So need to comment out the pfuze code for original power
framework, when CONFIG_DM_PMIC_PFUZE100 defined.
Signed-off-by: Peng Fan <
[email protected]
>
Cc: Przemyslaw Marczak <
[email protected]
>
Cc: Simon Glass <
[email protected]
>
Cc: Stefano Babic <
[email protected]
>
Reviewed-by: Simon Glass <
[email protected]
>
board/freescale/common/pfuze.c
patch
|
blob
|
history
diff --git
a/board/freescale/common/pfuze.c
b/board/freescale/common/pfuze.c
index d6a209e1a3743fd6d732915e44d98293feb07d1d..783c46d882846d1f17e05ce48ed6b32cbca1105f 100644
(file)
--- a/
board/freescale/common/pfuze.c
+++ b/
board/freescale/common/pfuze.c
@@
-9,6
+9,7
@@
#include <power/pmic.h>
#include <power/pfuze100_pmic.h>
+#ifndef CONFIG_DM_PMIC_PFUZE100
int pfuze_mode_init(struct pmic *p, u32 mode)
{
unsigned char offset, i, switch_num;
@@
-90,3
+91,4
@@
struct pmic *pfuze_common_init(unsigned char i2cbus)
return p;
}
+#endif